plausible · mehul0810 · Dec 13, 2020 · Nov 25, 2020 · Nov 25, 2020 · Nov 25, 2020
diff --git a/.distignore b/.distignore
@@ -0,0 +1,54 @@
+/.git
+/.wordpress-org
+.gitignore
+.gitattributes
+
+/.idea
+/.github
+/.storybook
+
+/tests
+/node_modules
+/assets/src
+/vendor/bin
+/vendor/composer/installers
+/wp-org-assets
+
+.scrutinizer.yml
+.travis.yml
+.editorconfig
+.babelrc
+.jscrsrc
+.jshintrc
+.eslintignore
+.eslintrc
+.eslintrc.json
+.prettierrc.json
+.prettierignore
+.stylelintrc.json
+.huskyrc.json
+.lintstagedrc.json
+.distignore
+.stylelintignore
+
+sample-data/wordpress.sql
+sample-data/sample-data.numbers
+bower.json
+composer.json
+composer.lock
+package.json
+package-lock.json
+phpunit.xml
+phpunit.xml.dist
+CHANGELOG.md
+README.md
+readme.md
+phpcs.ruleset.xml
+phpcs.xml.dist
+CONTRIBUTING.md
+CODE_OF_CONDUCT.md
+contributing.md
+postcss.config.js
+webpack.config.js
+docker-compose.yml
+wp-textdomain.js
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -129,7 +129,6 @@
         "no-undef-init": "error",
         "no-unreachable": "error",
         "no-unsafe-negation": "error",
-        "no-unused-expressions": "error",
         "no-unused-vars": "error",
         "no-useless-computed-key": "error",
         "no-useless-constructor": "error",

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -0,0 +1,41 @@
+name: Build Plugin Pre-Release
+
+on:
+  release:
+    types: [ prereleased ]
+
+jobs:
+  build:
+    name:    Build Plugin Artifact
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install composer dependencies
+        uses: php-actions/composer@v2
+        with:
+          dev: no
+
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '14'
+
+      - name: Install npm dependencies
+        run: |
+          npm ci
+          sudo npm run build
+      - name: Generate plugin artifact
+        run: |
+          rsync -rc --exclude-from="$GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" release/ --delete --delete-excluded
+          cd "${GITHUB_WORKSPACE}/release" || exit
+          zip -r "${GITHUB_WORKSPACE}/plausible-analytics.zip" .
+      - name: Upload release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{github.workspace}}/plausible-analytics.zip
+          asset_name: plausible-analytics.zip
+          asset_content_type: application/zip
diff --git a/.github/workflows/deploy.yml → .github/workflows/release.yml b/.github/workflows/deploy.yml → .github/workflows/release.yml
@@ -1,19 +1,30 @@
-name: Build & Deploy to WordPress.org
+name: Deploy to WordPress.org
+
 on:
   release:
-    types: [published]
+    types: [ released ]
+
 jobs:
   tag:
-    name: Plausible Analytics
+    name: New release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Build
+
+      - name: Install composer dependencies
+        uses: php-actions/composer@v2
+        with:
+          dev: no
+
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '14'
+
+      - name: Install npm dependencies
         run: |
-          composer install
-          npm install
-          npm run build
+          npm ci
+          sudo npm run build
       - name: WordPress Plugin Deploy
         id: deploy
         uses: 10up/action-wordpress-plugin-deploy@stable
@@ -23,12 +34,13 @@ jobs:
           SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
           SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
           SLUG: plausible-analytics
+
       - name: Upload release asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ${{github.workspace}}/${{ github.event.repository.name }}.zip
-          asset_name: ${{ github.event.repository.name }}.zip
+          asset_path: ${{github.workspace}}/plausible-analytics.zip
+          asset_name: plausible-analytics.zip
           asset_content_type: application/zip
diff --git a/assets/src/css/admin/general.scss b/assets/src/css/admin/general.scss
@@ -0,0 +1,84 @@
+.plausible-analytics-hidden {
+	display: none;
+}
+
+.plausible-analytics-show {
+	display: block;
+}
+
+.plausible-analytics-content {
+	@extend .plausible-analytics-hidden;
+}
+
+.plausible-analytics-header {
+	display: flex;
+	align-items: center;
+	background-color: #fff;
+	padding: 0;
+	padding: 0;
+	margin: 0 0 0 -20px;
+
+	.plausible-analytics-logo {
+		padding: 20px;
+		border-right: 1px solid #f1f1f1;
+
+		img {
+			width: 36px;
+			height: 100%;
+		}
+	}
+
+	.plausible-analytics-title {
+		padding: 20px;
+	}
+
+	.plausible-analytics-actions {
+		display: flex;
+		margin-left: auto;
+		padding: 20px;
+	}
+}
+
+.plausible-analytics-wrap {
+	width: 800px;
+	margin: 0 auto;
+	margin-top: 50px;
+
+	.plausible-analytics-admin-field {
+		background-color: #fff;
+		margin-bottom: 20px;
+		padding: 15px;
+
+		.plausible-analytics-admin-field-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			label {
+				font-weight: 700;
+
+				.plausible-analytics-admin-field-input {
+					font-weight: 400;
+					font-size: 14px;
+
+					input[type='text'] {
+						background-color: #f5f5f5;
+						border: none;
+						border-radius: 5px;
+					}
+				}
+			}
+		}
+		.plausible-analytics-description {
+			font-style: italic;
+			color: #989898;
+			border-top: 1px dashed #e5e5e5;
+			padding: 10px 0 0 0;
+			margin: 15px 0 0 0;
+
+			ol {
+				margin: 5px 15px;
+			}
+		}
+	}
+}
diff --git a/assets/src/css/admin/main.scss b/assets/src/css/admin/main.scss
@@ -1,78 +1,7 @@
 @import './_variables';
 @import './_mixins';
+@import './menu.scss';
+@import './general.scss';
 @import './switch.scss';
 @import './trigger.scss';
 @import './spinner.scss';
-
-.plausible-analytics-header {
-	display: flex;
-	align-items: center;
-	background-color: #fff;
-	padding: 0;
-	padding: 0;
-	margin: 0 0 0 -20px;
-
-	.plausible-analytics-logo {
-		padding: 20px;
-		border-right: 1px solid #f1f1f1;
-
-		img {
-			width: 36px;
-			height: 100%;
-		}
-	}
-
-	.plausible-analytics-title {
-		padding: 20px;
-	}
-
-	.plausible-analytics-actions {
-		display: flex;
-		margin-left: auto;
-		padding: 20px;
-	}
-}
-
-.plausible-analytics-wrap {
-	width: 800px;
-	margin: 0 auto;
-	margin-top: 50px;
-
-	.plausible-analytics-admin-field {
-		background-color: #fff;
-		margin-bottom: 20px;
-		padding: 15px;
-
-		.plausible-analytics-admin-field-header {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			label {
-				font-weight: 700;
-
-				.plausible-analytics-admin-field-input {
-					font-weight: 400;
-					font-size: 14px;
-
-					input[type='text'] {
-						background-color: #f5f5f5;
-						border: none;
-						border-radius: 5px;
-					}
-				}
-			}
-		}
-		.plausible-analytics-description {
-			font-style: italic;
-			color: #989898;
-			border-top: 1px dashed #e5e5e5;
-			padding: 10px 0 0 0;
-			margin: 15px 0 0 0;
-
-			ol {
-				margin: 5px 15px;
-			}
-		}
-	}
-}
diff --git a/assets/src/css/admin/menu.scss b/assets/src/css/admin/menu.scss
@@ -0,0 +1,30 @@
+.plausible-analytics-admin-menu {
+	// padding: 0 !important;
+
+	ul {
+		display: flex;
+		align-items: center;
+
+		li {
+			list-style: none;
+			margin: 0;
+
+			a {
+				padding: 15px;
+				text-decoration: none;
+				text-transform: uppercase;
+				color: #333;
+				font-weight: 500;
+				outline: none;
+				box-shadow: none;
+
+				&.active {
+					border-bottom: 3px solid $base-color;
+					color: $base-color;
+					outline: none;
+					box-shadow: none;
+				}
+			}
+		}
+	}
+}