diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..ae8a53c
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,2 @@
+# set ubuntu version to 20.04 - https://github.com/devcontainers/features/issues/372
+FROM mcr.microsoft.com/vscode/devcontainers/base:0-ubuntu-20.04
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..a3475d4
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,19 @@
+{
+ "name": "GCP playground",
+ "image": "mcr.microsoft.com/vscode/devcontainers/python:3",
+ "features": {
+ "ghcr.io/devcontainers/features/sshd:1": {
+ "version": "latest"
+ }
+ },
+ "settings": {
+ "extensions.ignoreRecommendations": true,
+ "workbench.startupEditor": "none",
+ "workbench.colorTheme": "Visual Studio Dark",
+ "workbench.colorCustomizations": {},
+ "workbench.welcomePage.walkthroughs.openOnInstall": false,
+ "workbench.welcomePage.experimental.videoTutorials": "off",
+ "github.codespaces.defaultExtensions": []
+ },
+ "postStartCommand": "bash -c .devcontainer/setup.sh"
+}
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
index f7bc939..48eb4c1 100755
--- a/.devcontainer/setup.sh
+++ b/.devcontainer/setup.sh
@@ -6,19 +6,7 @@ export ENGINE_EVENT_ENDPOINT="${ENGINE_BASE_URL}/users/${WILCO_ID}/event"
# Update engine that codespace started for user
curl -L -X POST "${ENGINE_EVENT_ENDPOINT}" -H "Content-Type: application/json" --data-raw "{ \"event\": \"github_codespace_started\" }"
-# Export backend envs when in codespaces
-echo "export CODESPACE_BACKEND_HOST=\"${CODESPACE_BACKEND_HOST}\"" >> ~/.bashrc
-echo "export CODESPACE_BACKEND_URL=\"${CODESPACE_BACKEND_URL}\"" >> ~/.bashrc
-echo "export CODESPACE_WDS_SOCKET_PORT=443" >> ~/.bashrc
-
-# Export welcome prompt in bash:
-echo "printf \"\n\n☁️☁️☁️️ Anythink: Develop in the Cloud ☁️☁️☁️\n\"" >> ~/.bashrc
-echo "printf \"\n\x1b[31m \x1b[1m👉 Type: \\\`docker compose up\\\` to run the project. 👈\n\n\"" >> ~/.bashrc
-
-nohup bash -c "cd /wilco-agent && node agent.js &" >> /tmp/agent.log 2>&1
-
-# Check if docker is installed
-if command -v docker &> /dev/null
-then
- docker compose pull
-fi
+echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
+sudo apt-get update
+sudo apt-get install -y google-cloud-sdk
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 8ebf549..0000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Description
-
-Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
diff --git a/.github/workflows/k8s.yml b/.github/workflows/k8s.yml
deleted file mode 100644
index 9a56d6a..0000000
--- a/.github/workflows/k8s.yml
+++ /dev/null
@@ -1,157 +0,0 @@
-name: Build and deploy to Kubernetes
-on:
- push:
- branches:
- - main
-
-concurrency:
- group: k8s
- cancel-in-progress: true
-
-jobs:
- check-kubernetes-enabled:
- runs-on: ubuntu-20.04
- outputs:
- kubernetes-enabled: ${{ steps.kubernetes-flag-defined.outputs.DEFINED }}
- steps:
- - id: kubernetes-flag-defined
- if: "${{ env.ENABLE_KUBERNETES != '' }}"
- run: echo "DEFINED=true" >> $GITHUB_OUTPUT
- env:
- ENABLE_KUBERNETES: ${{ secrets.ENABLE_KUBERNETES }}
-
- check-secret:
- runs-on: ubuntu-20.04
- needs: [check-kubernetes-enabled]
- outputs:
- aws-creds-defined: ${{ steps.aws-creds-defined.outputs.DEFINED }}
- kubeconfig-defined: ${{ steps.kubeconfig-defined.outputs.DEFINED }}
- if: needs.check-kubernetes-enabled.outputs.kubernetes-enabled == 'true'
- steps:
- - id: aws-creds-defined
- if: "${{ env.AWS_ACCESS_KEY_ID != '' && env.AWS_SECRET_ACCESS_KEY != '' }}"
- run: echo "DEFINED=true" >> $GITHUB_OUTPUT
- env:
- AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
- AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-
- - id: kubeconfig-defined
- if: "${{ env.KUBECONFIG != '' }}"
- run: echo "DEFINED=true" >> $GITHUB_OUTPUT
- env:
- KUBECONFIG: ${{ secrets.KUBECONFIG }}
-
- build-backend:
- name: Build backend image
- runs-on: ubuntu-20.04
- needs: [check-secret]
- if: needs.check-secret.outputs.aws-creds-defined == 'true'
- steps:
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Configure AWS credentials
- uses: aws-actions/configure-aws-credentials@v1-node16
- with:
- aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
- aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- aws-region: us-east-2
-
- - name: Login to Amazon ECR
- id: login-ecr
- uses: aws-actions/amazon-ecr-login@v1
-
- - name: Set the image tag
- run: echo IMAGE_TAG=${GITHUB_REPOSITORY/\//-}-latest >> $GITHUB_ENV
-
- - name: Set repository name
- run: |
- if [ ${{ secrets.CLUSTER_ENV }} == 'staging' ]; then
- echo "REPO_NAME=staging-anythink-backend" >> $GITHUB_ENV
- else
- echo "REPO_NAME=anythink-backend" >> $GITHUB_ENV
- fi
-
- - name: Build, tag, and push backend image to Amazon ECR
- id: build-image-backend
- run: |
- docker build \
- -t ${{ steps.login-ecr.outputs.registry }}/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }} \
- -f backend/Dockerfile.aws \
- .
- docker push ${{ steps.login-ecr.outputs.registry }}/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }}
-
- build-frontend:
- name: Build frontend images
- runs-on: ubuntu-20.04
- needs: [check-secret]
- if: needs.check-secret.outputs.aws-creds-defined == 'true'
- steps:
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Configure AWS credentials
- uses: aws-actions/configure-aws-credentials@v1-node16
- with:
- aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
- aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- aws-region: us-east-2
-
- - name: Login to Amazon ECR
- id: login-ecr
- uses: aws-actions/amazon-ecr-login@v1
-
- - name: Set the image tag
- run: echo IMAGE_TAG=${GITHUB_REPOSITORY/\//-}-latest >> $GITHUB_ENV
-
- - name: Set repository name
- run: |
- if [ ${{ secrets.CLUSTER_ENV }} == 'staging' ]; then
- echo "REPO_NAME=staging-anythink-frontend" >> $GITHUB_ENV
- else
- echo "REPO_NAME=anythink-frontend" >> $GITHUB_ENV
- fi
-
- - name: Build, tag, and push frontend image to Amazon ECR
- id: build-image-frontend
- run: |
- docker build \
- -t ${{ steps.login-ecr.outputs.registry }}/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }} \
- -f frontend/Dockerfile.aws \
- .
- docker push ${{ steps.login-ecr.outputs.registry }}/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }}
-
- deploy:
- name: Deploy latest tag using helm
- runs-on: ubuntu-20.04
- if: needs.check-secret.outputs.kubeconfig-defined == 'true'
- needs:
- - build-frontend
- - build-backend
- steps:
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Create kube config
- run: |
- mkdir -p $HOME/.kube/
- echo "${{ secrets.KUBECONFIG }}" > $HOME/.kube/config
- chmod 600 $HOME/.kube/config
- - name: Install helm
- run: |
- curl -LO https://get.helm.sh/helm-v3.8.0-linux-amd64.tar.gz
- tar -zxvf helm-v3.8.0-linux-amd64.tar.gz
- mv linux-amd64/helm /usr/local/bin/helm
- helm version
- - name: Lint helm charts
- run: helm lint ./charts/
-
- - name: Set the image tag
- run: echo IMAGE_TAG=${GITHUB_REPOSITORY/\//-}-latest >> $GITHUB_ENV
-
- - name: Deploy
- run: |
- helm upgrade --install --timeout 10m anythink-market ./charts/ \
- --set clusterEnv=${{ secrets.CLUSTER_ENV }} \
- --set frontend.image.tag=${{ env.IMAGE_TAG }} \
- --set backend.image.tag=${{ env.IMAGE_TAG }}
diff --git a/.github/workflows/wilco-actions.yml b/.github/workflows/wilco-actions.yml
new file mode 100644
index 0000000..b732c86
--- /dev/null
+++ b/.github/workflows/wilco-actions.yml
@@ -0,0 +1,24 @@
+on:
+ pull_request:
+ branches:
+ - main
+
+jobs:
+ wilco:
+ runs-on: ubuntu-20.04
+ timeout-minutes: 10
+ name: Pr checks
+
+ steps:
+ - name: Check out project
+ uses: actions/checkout@v2
+
+ - uses: oNaiPs/secrets-to-env-action@v1
+ with:
+ secrets: ${{ toJSON(secrets) }}
+
+ - name: Wilco checks
+ id: Wilco
+ uses: trywilco/actions@main
+ with:
+ engine: ${{ secrets.WILCO_ENGINE_URL }}
diff --git a/.gitignore b/.gitignore
index 10d146d..a09c56d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/backend/node_modules
-/frontend/node_modules
-/.wilco-helpers/node_modules
-/tests/e2e/node_modules
-/tests/frontend/node_modules/
-/tests/frontend/test-results/
-/tests/frontend/playwright-report/
-/tests/frontend/playwright/.cache/
-
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/backend/build
-/frontend/build
-
-# misc
-.DS_Store
-.env
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-#IDEs
-/.idea/
+/.idea
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 0c878f1..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "workbench.startupEditor": "none"
-}
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1eecd16
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# gcp-playground
+GCP playground
diff --git a/create_wilco_user.sh b/create_wilco_user.sh
new file mode 100755
index 0000000..977fb0a
--- /dev/null
+++ b/create_wilco_user.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Variables
+SERVICE_ACCOUNT_NAME="wilco-checks-service-account"
+DESCRIPTION="Verify wilco actions"
+DISPLAY_NAME="Wilco checks"
+PROJECT_ID=$(gcloud config get-value project)
+ROLE="roles/owner"
+KEY_FILE_PATH="/tmp/wilco_creds.json"
+
+# Create the service account
+gcloud iam service-accounts create $SERVICE_ACCOUNT_NAME \
+ --description="$DESCRIPTION" \
+ --display-name="$DISPLAY_NAME"
+
+# Assign the role to the service account
+gcloud projects add-iam-policy-binding $PROJECT_ID \
+ --member="serviceAccount:${SERVICE_ACCOUNT_NAME}@${PROJECT_ID}.iam.gserviceaccount.com" \
+ --role="$ROLE"
+
+# Generate the key file for the service account
+gcloud iam service-accounts keys create $KEY_FILE_PATH \
+ --iam-account "${SERVICE_ACCOUNT_NAME}@${PROJECT_ID}.iam.gserviceaccount.com"
+
+gcloud services enable dataflow.googleapis.com
+
+credentials="`cat $KEY_FILE_PATH`"
+stringified_credentials="$(echo "$credentials" | jq -R -s .)"
+
+
+WILCO_ID="`cat .wilco`"
+export ENGINE_EVENT_ENDPOINT="${ENGINE_BASE_URL}/users/${WILCO_ID}/event"
+
+# Update engine with service account credentials
+
+curl -L -X POST "${ENGINE_EVENT_ENDPOINT}" -H "Content-Type: application/json" --data-raw "{ \"event\": \"gcp_service_account_created\", \"metadata\": {\"credentials\": $stringified_credentials, \"project_id\": \"$PROJECT_ID\" }}"
+
+export GOOGLE_APPLICATION_CREDENTIALS=$KEY_FILE_PATH
+
+echo "Service account created successfully"
diff --git a/frontend/.eslintignore b/frontend/.eslintignore
deleted file mode 100644
index dd87e2d..0000000
--- a/frontend/.eslintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-build
diff --git a/frontend/.gitignore b/frontend/.gitignore
deleted file mode 100644
index edfc119..0000000
--- a/frontend/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# dependencies
-node_modules
-
-# testing
-coverage
-
-# production
-build
-
-# misc
-.DS_Store
-.env
-npm-debug.log
-.idea
\ No newline at end of file
diff --git a/frontend/Dockerfile.aws b/frontend/Dockerfile.aws
deleted file mode 100644
index 9485ac1..0000000
--- a/frontend/Dockerfile.aws
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM node:16
-WORKDIR /usr/src
-
-COPY frontend ./frontend
-COPY .wilco ./.wilco
-
-# Pre-install npm packages
-WORKDIR /usr/src/frontend
-RUN yarn install
diff --git a/frontend/jest.config.js b/frontend/jest.config.js
deleted file mode 100644
index 582fe82..0000000
--- a/frontend/jest.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const config = {
- verbose: true,
- jest: {
- setupFilesAfterEnv: ["src/setupTests.js"],
- },
-};
-
-module.exports = config;
diff --git a/frontend/package.json b/frontend/package.json
deleted file mode 100644
index 45a643d..0000000
--- a/frontend/package.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "name": "anythink-market-front",
- "version": "0.1.0",
- "engines": {
- "node": "^16"
- },
- "private": true,
- "devDependencies": {
- "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
- "core-js": "^3.25.1",
- "enzyme": "^3.11.0",
- "eslint-config-prettier": "^8.3.0",
- "eslint-plugin-react": "^7.26.1",
- "prettier": "2.4.1",
- "react-test-renderer": "^17.0.2",
- "redux-mock-store": "^1.5.4"
- },
- "dependencies": {
- "@babel/core": "^7.18.13",
- "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
- "@babel/plugin-syntax-flow": "^7.18.6",
- "@babel/plugin-transform-react-jsx": "^7.18.10",
- "bootstrap": "^4.6.0",
- "bootstrap-icons": "^1.7.1",
- "history": "^4.6.3",
- "jquery": "^3.6.1",
- "marked": "^0.3.6",
- "postcss": "^8.4.16",
- "prop-types": "^15.5.10",
- "react": "^17.0.2",
- "react-dom": "^17.0.2",
- "react-redux": "^5.0.7",
- "react-router-dom": "^6.9.0",
- "react-scripts": "^5.0.1",
- "redux": "^3.6.0",
- "redux-devtools-extension": "^2.13.2",
- "sass": "^1.45.0",
- "superagent": "^3.8.2",
- "superagent-promise": "^1.1.0",
- "typescript": "^4.8.2"
- },
- "scripts": {
- "start": "REACT_APP_WILCO_ID=${WILCO_ID:-\"$(cat ../.wilco)\"} react-scripts start",
- "build": "react-scripts build",
- "test": "react-scripts test --env=jsdom",
- "eject": "react-scripts eject",
- "format": "yarn prettier --write .",
- "lint": "yarn eslint . && yarn prettier --check ."
- },
- "eslintConfig": {
- "extends": [
- "react-app",
- "eslint:recommended"
- ],
- "rules": {
- "no-var": "error"
- }
- },
- "browserslist": {
- "production": [
- ">0.2%",
- "not dead",
- "not op_mini all"
- ],
- "development": [
- "last 1 chrome version",
- "last 1 firefox version",
- "last 1 safari version"
- ]
- },
- "resolutions": {
- "autoprefixer": "10.4.5"
- }
-}
diff --git a/frontend/public/50precentoff.png b/frontend/public/50precentoff.png
deleted file mode 100644
index 4c835a1..0000000
Binary files a/frontend/public/50precentoff.png and /dev/null differ
diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico
deleted file mode 100644
index 201ae78..0000000
Binary files a/frontend/public/favicon.ico and /dev/null differ
diff --git a/frontend/public/index.html b/frontend/public/index.html
deleted file mode 100644
index f0441fc..0000000
--- a/frontend/public/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Anythink Market
-
-
-
-
-
-
diff --git a/frontend/public/placeholder.png b/frontend/public/placeholder.png
deleted file mode 100644
index bf1d310..0000000
Binary files a/frontend/public/placeholder.png and /dev/null differ
diff --git a/frontend/public/style.css b/frontend/public/style.css
deleted file mode 100644
index 2bb7fe2..0000000
--- a/frontend/public/style.css
+++ /dev/null
@@ -1,54 +0,0 @@
-* {
- -webkit-font-smoothing: antialiased;
-}
-body {
- font-family: "Inter", sans-serif;
- -ms-text-size-adjust: 100%;
- -webkit-text-size-adjust: 100%;
- text-rendering: optimizeLegibility;
- -moz-osx-font-smoothing: grayscale;
- -webkit-font-feature-settings: "kern" 1, "liga" 1;
- font-feature-settings: "kern" 1, "liga" 1;
- scroll-behavior: smooth;
-}
-.top-announcement {
- background-color: #59ca00;
- padding: 15px;
- font-size: 18px;
- color: white;
-}
-.logo-text {
- color: #59ca00 !important;
- font-weight: 600;
-}
-.minegeek-navbar {
- background-color: #393939;
-}
-.sunray {
- background-image: url("sunray.jpeg");
- background-size: cover;
-}
-.text-white {
- color: white;
-}
-.row-eq-height {
- display: -webkit-box;
- display: -webkit-flex;
- display: -ms-flexbox;
- display: flex;
-}
-.minegear-btn {
- background-color: #59ca00;
- border: 0px;
- border-radius: 0px;
-}
-.dramaticPerson {
- opacity: 0;
- position: fixed;
- right: -500px;
- bottom: 0px;
- height: 590px;
- width: 490px;
- z-index: 1041;
- background-size: cover;
-}
diff --git a/frontend/public/sunray.jpeg b/frontend/public/sunray.jpeg
deleted file mode 100644
index f133496..0000000
Binary files a/frontend/public/sunray.jpeg and /dev/null differ
diff --git a/frontend/public/verified_seller.svg b/frontend/public/verified_seller.svg
deleted file mode 100644
index 2e1b353..0000000
--- a/frontend/public/verified_seller.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
diff --git a/frontend/readme.md b/frontend/readme.md
deleted file mode 100644
index 2f5bc17..0000000
--- a/frontend/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Anythink Frontend
-
-The Anythink Frontend is an SPA written with [React](https://reactjs.org/) and [Redux](https://redux.js.org/)
-
-## Getting started
-
-Make sure your server is up and running to serve requests.
-
-## Pages overview
-
-- Home page (URL: /#/ )
- - List of tags
- - List of items pulled from either Feed, Global, or by Tag
- - Pagination for list of items
-- Sign in/Sign up pages (URL: /#/login, /#/register )
- - Use JWT (store the token in localStorage)
-- Settings page (URL: /#/settings )
-- Editor page to create/edit articles (URL: /#/editor, /#/editor/slug )
-- Item page (URL: /#/item/slug )
- - Delete item button (only shown to item's author)
- - Render markdown from server client side
- - Comments section at bottom of page
- - Delete comment button (only shown to comment's author)
-- Profile page (URL: /#/@username, /#/@username/favorites )
- - Show basic user info
- - List of items populated from seller's items or user favorite items
diff --git a/frontend/src/agent.js b/frontend/src/agent.js
deleted file mode 100644
index 972f3e3..0000000
--- a/frontend/src/agent.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import superagentPromise from "superagent-promise";
-import _superagent from "superagent";
-
-const superagent = superagentPromise(_superagent, global.Promise);
-
-const BACKEND_URL =
- process.env.NODE_ENV !== "production"
- ? process.env.REACT_APP_BACKEND_URL
- : "https://api.anythink.market";
-
-const API_ROOT = `${BACKEND_URL}/api`;
-
-const encode = encodeURIComponent;
-const responseBody = (res) => res.body;
-
-let token = null;
-const tokenPlugin = (req) => {
- if (token) {
- req.set("authorization", `Token ${token}`);
- }
-};
-
-const requests = {
- del: (url) =>
- superagent.del(`${API_ROOT}${url}`).use(tokenPlugin).then(responseBody),
- get: (url) =>
- superagent.get(`${API_ROOT}${url}`).use(tokenPlugin).then(responseBody),
- put: (url, body) =>
- superagent
- .put(`${API_ROOT}${url}`, body)
- .use(tokenPlugin)
- .then(responseBody),
- post: (url, body) =>
- superagent
- .post(`${API_ROOT}${url}`, body)
- .use(tokenPlugin)
- .then(responseBody),
-};
-
-const Auth = {
- current: () => requests.get("/user"),
- login: (email, password) =>
- requests.post("/users/login", { user: { email, password } }),
- register: (username, email, password) =>
- requests.post("/users", { user: { username, email, password } }),
- save: (user) => requests.put("/user", { user }),
-};
-
-const Tags = {
- getAll: () => requests.get("/tags"),
-};
-
-const limit = (count, p) => `limit=${count}&offset=${p ? p * count : 0}`;
-const omitSlug = (item) => Object.assign({}, item, { slug: undefined });
-const Items = {
- all: (page) => requests.get(`/items?${limit(1000, page)}`),
- bySeller: (seller, page) =>
- requests.get(`/items?seller=${encode(seller)}&${limit(500, page)}`),
- byTag: (tag, page) =>
- requests.get(`/items?tag=${encode(tag)}&${limit(1000, page)}`),
- del: (slug) => requests.del(`/items/${slug}`),
- favorite: (slug) => requests.post(`/items/${slug}/favorite`),
- favoritedBy: (seller, page) =>
- requests.get(`/items?favorited=${encode(seller)}&${limit(500, page)}`),
- feed: () => requests.get("/items/feed?limit=10&offset=0"),
- get: (slug) => requests.get(`/items/${slug}`),
- unfavorite: (slug) => requests.del(`/items/${slug}/favorite`),
- update: (item) =>
- requests.put(`/items/${item.slug}`, { item: omitSlug(item) }),
- create: (item) => requests.post("/items", { item }),
-};
-
-const Comments = {
- create: (slug, comment) =>
- requests.post(`/items/${slug}/comments`, { comment }),
- delete: (slug, commentId) =>
- requests.del(`/items/${slug}/comments/${commentId}`),
- forItem: (slug) => requests.get(`/items/${slug}/comments`),
-};
-
-const Profile = {
- follow: (username) => requests.post(`/profiles/${username}/follow`),
- get: (username) => requests.get(`/profiles/${username}`),
- unfollow: (username) => requests.del(`/profiles/${username}/follow`),
-};
-
-const agentObj = {
- Items,
- Auth,
- Comments,
- Profile,
- Tags,
- setToken: (_token) => {
- token = _token;
- },
-};
-
-export default agentObj;
diff --git a/frontend/src/components/App.js b/frontend/src/components/App.js
deleted file mode 100644
index 8b23812..0000000
--- a/frontend/src/components/App.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import agent from "../agent";
-import Header from "./Header";
-import React, { useEffect } from "react";
-import { connect } from "react-redux";
-import { APP_LOAD, REDIRECT } from "../constants/actionTypes";
-import Item from "./Item";
-import Editor from "./Editor";
-import Home from "./Home";
-import Login from "./Login";
-import Profile from "./Profile";
-import ProfileFavorites from "./ProfileFavorites";
-import Register from "./Register";
-import Settings from "./Settings";
-import { Route, Routes, useNavigate } from "react-router-dom";
-
-const mapStateToProps = (state) => {
- return {
- appLoaded: state.common.appLoaded,
- appName: state.common.appName,
- currentUser: state.common.currentUser,
- redirectTo: state.common.redirectTo,
- };
-};
-
-const mapDispatchToProps = (dispatch) => ({
- onLoad: (payload, token) =>
- dispatch({ type: APP_LOAD, payload, token, skipTracking: true }),
- onRedirect: () => dispatch({ type: REDIRECT }),
-});
-
-const App = (props) => {
- const { redirectTo, onRedirect, onLoad } = props;
- const navigate = useNavigate();
-
- useEffect(() => {
- if (redirectTo) {
- navigate(redirectTo);
- onRedirect();
- }
- }, [redirectTo, onRedirect, navigate]);
-
- useEffect(() => {
- const token = window.localStorage.getItem("jwt");
- if (token) {
- agent.setToken(token);
- }
- onLoad(token ? agent.Auth.current() : null, token);
- }, [onLoad]);
-
- if (props.appLoaded) {
- return (
-
-
-
- } />
- } />
- } />
- } />
- } />
- } />
- } />
- } />
- } />
-
-
- );
- }
- return (
-
-
-
- );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(App);
\ No newline at end of file
diff --git a/frontend/src/components/Editor.js b/frontend/src/components/Editor.js
deleted file mode 100644
index 700a401..0000000
--- a/frontend/src/components/Editor.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import ListErrors from "./ListErrors";
-import React from "react";
-import agent from "../agent";
-import { connect } from "react-redux";
-import {
- ADD_TAG,
- EDITOR_PAGE_LOADED,
- REMOVE_TAG,
- ITEM_SUBMITTED,
- EDITOR_PAGE_UNLOADED,
- UPDATE_FIELD_EDITOR,
-} from "../constants/actionTypes";
-import { withRouterParams } from "./commons";
-
-const mapStateToProps = (state) => ({
- ...state.editor,
-});
-
-const mapDispatchToProps = (dispatch) => ({
- onAddTag: () => dispatch({ type: ADD_TAG }),
- onLoad: (payload) => dispatch({ type: EDITOR_PAGE_LOADED, payload }),
- onRemoveTag: (tag) => dispatch({ type: REMOVE_TAG, tag }),
- onSubmit: (payload) => dispatch({ type: ITEM_SUBMITTED, payload }),
- onUnload: (payload) => dispatch({ type: EDITOR_PAGE_UNLOADED }),
- onUpdateField: (key, value) =>
- dispatch({ type: UPDATE_FIELD_EDITOR, key, value }),
-});
-
-class Editor extends React.Component {
- constructor() {
- super();
-
- const updateFieldEvent = (key) => (ev) =>
- this.props.onUpdateField(key, ev.target.value);
- this.changeTitle = updateFieldEvent("title");
- this.changeDescription = updateFieldEvent("description");
- this.changeImage = updateFieldEvent("image");
- this.changeTagInput = updateFieldEvent("tagInput");
-
- this.watchForEnter = (ev) => {
- if (ev.keyCode === 13) {
- ev.preventDefault();
- this.props.onAddTag();
- }
- };
-
- this.removeTagHandler = (tag) => () => {
- this.props.onRemoveTag(tag);
- };
-
- this.submitForm = (ev) => {
- ev.preventDefault();
- const item = {
- title: this.props.title,
- description: this.props.description,
- image: this.props.image,
- tagList: this.props.tagList,
- };
-
- const slug = { slug: this.props.itemSlug };
- const promise = this.props.itemSlug
- ? agent.Items.update(Object.assign(item, slug))
- : agent.Items.create(item);
-
- this.props.onSubmit(promise);
- };
- }
-
- componentDidUpdate(prevProps) {
- if (this.props.params.slug !== prevProps.params.slug) {
- if (this.props.params.slug) {
- this.props.onUnload();
- return this.props.onLoad(agent.Items.get(this.props.params.slug));
- }
- this.props.onLoad(null);
- }
- }
-
- componentDidMount() {
- if (this.props.params.slug) {
- return this.props.onLoad(agent.Items.get(this.props.params.slug));
- }
- this.props.onLoad(null);
- }
-
- componentWillUnmount() {
- this.props.onUnload();
- }
-
- render() {
- return (
-
- );
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(withRouterParams(Editor));
diff --git a/frontend/src/components/Header.js b/frontend/src/components/Header.js
deleted file mode 100644
index be37dfc..0000000
--- a/frontend/src/components/Header.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import React from "react";
-import { Link } from "react-router-dom";
-import logo from "../imgs/topbar_logo.png";
-
-const LoggedOutView = () => {
- return (
-
- -
-
- Sign in
-
-
-
- -
-
- Sign up
-
-
-
- );
-};
-
-const LoggedInView = (props) => {
- return (
-
- -
-
- New Item
-
-
-
- -
-
- Settings
-
-
-
- -
-
-
- {props.currentUser.username}
-
-
-
- );
-};
-
-class Header extends React.Component {
- render() {
- return (
-
- );
- }
-}
-
-export default Header;
diff --git a/frontend/src/components/Home/Banner.js b/frontend/src/components/Home/Banner.js
deleted file mode 100644
index 60eed20..0000000
--- a/frontend/src/components/Home/Banner.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from "react";
-import logo from "../../imgs/logo.png";
-
-const Banner = () => {
- return (
-
-
-
-
- A place to
- get
- the cool stuff.
-
-
-
- Popular tags:
-
- {tags.map((tag) => {
- const handleClick = (ev) => {
- ev.preventDefault();
- props.onClickTag(
- tag,
- (page) => agent.Items.byTag(tag, page),
- agent.Items.byTag(tag)
- );
- };
-
- return (
-
- );
- })}
-
-
- );
- } else {
- return Loading Tags...
;
- }
-};
-
-export default Tags;
diff --git a/frontend/src/components/Home/index.js b/frontend/src/components/Home/index.js
deleted file mode 100644
index 34e09ae..0000000
--- a/frontend/src/components/Home/index.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import Banner from "./Banner";
-import MainView from "./MainView";
-import React, { useEffect } from "react";
-import Tags from "./Tags";
-import agent from "../../agent";
-import { connect } from "react-redux";
-import {
- HOME_PAGE_LOADED,
- HOME_PAGE_UNLOADED,
- APPLY_TAG_FILTER,
-} from "../../constants/actionTypes";
-
-const Promise = global.Promise;
-
-const mapStateToProps = (state) => ({
- ...state.home,
- appName: state.common.appName,
- token: state.common.token,
-});
-
-const mapDispatchToProps = (dispatch) => ({
- onClickTag: (tag, pager, payload) =>
- dispatch({ type: APPLY_TAG_FILTER, tag, pager, payload }),
- onLoad: (tab, pager, payload) =>
- dispatch({ type: HOME_PAGE_LOADED, tab, pager, payload }),
- onUnload: () => dispatch({ type: HOME_PAGE_UNLOADED }),
-});
-
-const Home = ({onLoad, onUnload, tags, onClickTag}) => {
- const tab = "all";
- const itemsPromise = agent.Items.all;
-
- useEffect(() => {
- onLoad(
- tab,
- itemsPromise,
- Promise.all([agent.Tags.getAll(), itemsPromise()])
- );
- return onUnload;
- }, [onLoad, onUnload, tab, itemsPromise]);
-
- return (
-
- );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(Home);
\ No newline at end of file
diff --git a/frontend/src/components/Item/Comment.js b/frontend/src/components/Item/Comment.js
deleted file mode 100644
index f852408..0000000
--- a/frontend/src/components/Item/Comment.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import DeleteButton from "./DeleteButton";
-import { Link } from "react-router-dom";
-import React from "react";
-
-const Comment = (props) => {
- const comment = props.comment;
- const show =
- props.currentUser && props.currentUser.username === comment.seller.username;
- return (
-
-
-
-
{comment.body}
-
-
-
-
-
-
- {comment.seller.username}
-
-
|
-
- {new Date(comment.createdAt).toDateString()}
-
-
-
-
-
-
-
-
-
- Sign in
-
- or
-
- sign up
-
- to add comments on this item.
-
-
- {props.comments.map((comment) => {
- return (
-
- );
- })}
-
- );
-};
-
-export default CommentList;
diff --git a/frontend/src/components/Item/DeleteButton.js b/frontend/src/components/Item/DeleteButton.js
deleted file mode 100644
index b78b1b2..0000000
--- a/frontend/src/components/Item/DeleteButton.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from "react";
-import agent from "../../agent";
-import { connect } from "react-redux";
-import { DELETE_COMMENT } from "../../constants/actionTypes";
-
-const mapDispatchToProps = (dispatch) => ({
- onClick: (payload, commentId) =>
- dispatch({ type: DELETE_COMMENT, payload, commentId }),
-});
-
-const DeleteButton = (props) => {
- const del = () => {
- const payload = agent.Comments.delete(props.slug, props.commentId);
- props.onClick(payload, props.commentId);
- };
-
- if (props.show) {
- return (
-
-
-
- );
- }
- return null;
-};
-
-export default connect(() => ({}), mapDispatchToProps)(DeleteButton);
diff --git a/frontend/src/components/Item/ItemActions.js b/frontend/src/components/Item/ItemActions.js
deleted file mode 100644
index b6d8615..0000000
--- a/frontend/src/components/Item/ItemActions.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Link } from "react-router-dom";
-import React from "react";
-import agent from "../../agent";
-import { connect } from "react-redux";
-import { DELETE_ITEM } from "../../constants/actionTypes";
-
-const mapDispatchToProps = (dispatch) => ({
- onClickDelete: (payload) => dispatch({ type: DELETE_ITEM, payload }),
-});
-
-const ItemActions = (props) => {
- const item = props.item;
- const del = () => {
- props.onClickDelete(agent.Items.del(item.slug));
- };
- if (props.canModify) {
- return (
-
-
- Edit Item
-
-
-
-
- );
- }
-
- return ;
-};
-
-export default connect(() => ({}), mapDispatchToProps)(ItemActions);
diff --git a/frontend/src/components/Item/ItemMeta.js b/frontend/src/components/Item/ItemMeta.js
deleted file mode 100644
index c3bdb6e..0000000
--- a/frontend/src/components/Item/ItemMeta.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import ItemActions from "./ItemActions";
-import { Link } from "react-router-dom";
-import React from "react";
-
-const ItemMeta = (props) => {
- const item = props.item;
- return (
-
- );
-};
-
-export default ItemMeta;
diff --git a/frontend/src/components/Item/index.js b/frontend/src/components/Item/index.js
deleted file mode 100644
index 7d1bf58..0000000
--- a/frontend/src/components/Item/index.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import ItemMeta from "./ItemMeta";
-import CommentContainer from "./CommentContainer";
-import React, { useEffect } from "react";
-import { connect } from "react-redux";
-import marked from "marked";
-import {
- ITEM_PAGE_LOADED,
- ITEM_PAGE_UNLOADED,
-} from "../../constants/actionTypes";
-import { getItemAndComments } from "./utils/ItemFetcher";
-import { useParams } from "react-router-dom";
-
-const mapStateToProps = (state) => ({
- ...state.item,
- currentUser: state.common.currentUser,
-});
-
-const mapDispatchToProps = (dispatch) => ({
- onLoad: (payload) => dispatch({ type: ITEM_PAGE_LOADED, payload }),
- onUnload: () => dispatch({ type: ITEM_PAGE_UNLOADED }),
-});
-
-const Item = (props) => {
- const params = useParams();
- const {onLoad, onUnload} = props;
- useEffect(() => {
- getItemAndComments(
- params.id
- ).then(([item, comments]) => {
- onLoad([item, comments]);
- });
- return onUnload;
- }, [onLoad, onUnload, params]);
-
- if (!props.item) {
- return null;
- }
-
- const markup = {
- __html: marked(props.item.description, { sanitize: true }),
- };
- const canModify =
- props.currentUser &&
- props.currentUser.username === props.item.seller.username;
- return (
-
-
-
-
-
-
-
-
-
{props.item.title}
-
-
- {props.item.tagList.map((tag) => {
- return (
-
- {tag}
-
- );
- })}
-
-
-
-
-
-
-
-
Loading...
;
- }
-
- if (props.items.length === 0) {
- return No items are here... yet.
;
- }
-
- return (
-
-
- {props.items.map((item) => {
- return (
-
-
-
- );
- })}
-
-
-
-
-
-
-
-
{item.title}
-
{item.description}
-
-
-
-
-
-
-
-
-
- {Object.keys(errors).map((key) => {
- return (
- -
- {key} {errors[key]}
-
- );
- })}
-
- );
- } else {
- return null;
- }
- }
-}
-
-export default ListErrors;
diff --git a/frontend/src/components/ListPagination.js b/frontend/src/components/ListPagination.js
deleted file mode 100644
index fcefbcc..0000000
--- a/frontend/src/components/ListPagination.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from "react";
-import agent from "../agent";
-import { connect } from "react-redux";
-import { SET_PAGE } from "../constants/actionTypes";
-
-const mapDispatchToProps = (dispatch) => ({
- onSetPage: (page, payload) => dispatch({ type: SET_PAGE, page, payload }),
-});
-
-const ListPagination = (props) => {
- if (props.itemsCount <= 10) {
- return null;
- }
-
- const range = [];
- for (let i = 0; i < Math.ceil(props.itemsCount / 10); ++i) {
- range.push(i);
- }
-
- const setPage = (page) => {
- if (props.pager) {
- props.onSetPage(page, props.pager(page));
- } else {
- props.onSetPage(page, agent.Items.all(page));
- }
- };
-
- return (
-
- );
-};
-
-export default connect(() => ({}), mapDispatchToProps)(ListPagination);
diff --git a/frontend/src/components/Login.js b/frontend/src/components/Login.js
deleted file mode 100644
index af4f12d..0000000
--- a/frontend/src/components/Login.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import { Link } from "react-router-dom";
-import ListErrors from "./ListErrors";
-import React from "react";
-import agent from "../agent";
-import { connect } from "react-redux";
-import {
- UPDATE_FIELD_AUTH,
- LOGIN,
- LOGIN_PAGE_UNLOADED,
-} from "../constants/actionTypes";
-
-const mapStateToProps = (state) => ({ ...state.auth });
-
-const mapDispatchToProps = (dispatch) => ({
- onChangeEmail: (value) =>
- dispatch({ type: UPDATE_FIELD_AUTH, key: "email", value }),
- onChangePassword: (value) =>
- dispatch({ type: UPDATE_FIELD_AUTH, key: "password", value }),
- onSubmit: (email, password) =>
- dispatch({ type: LOGIN, payload: agent.Auth.login(email, password) }),
- onUnload: () => dispatch({ type: LOGIN_PAGE_UNLOADED }),
-});
-
-class Login extends React.Component {
- constructor() {
- super();
- this.changeEmail = (ev) => this.props.onChangeEmail(ev.target.value);
- this.changePassword = (ev) => this.props.onChangePassword(ev.target.value);
- this.submitForm = (email, password) => (ev) => {
- ev.preventDefault();
- this.props.onSubmit(email, password);
- };
- }
-
- componentWillUnmount() {
- this.props.onUnload();
- }
-
- render() {
- const email = this.props.email;
- const password = this.props.password;
- return (
-
-
-
-
-
Sign In
-
-
-
-
-
-
- Need an account?
-
-
-
-
-
-
- -
-
- My Items
-
-
-
- -
-
- Favorited Items
-
-
-
- );
- }
-
- render() {
- const profile = this.props.profile;
- if (!profile) {
- return null;
- }
-
- const isUser =
- this.props.currentUser &&
- this.props.profile.username === this.props.currentUser.username;
-
- return (
-
-
-
-
-
-
{profile.username}
-
{profile.bio}
-
-
-
-
-
-
-
-
-
-
-
{this.renderTabs()}
-
-
-
-
-
-
- -
-
- My Items
-
-
-
- -
-
- Favorited Items
-
-
-
- );
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(withRouterParams(ProfileFavorites));
diff --git a/frontend/src/components/Register.js b/frontend/src/components/Register.js
deleted file mode 100644
index 195a25a..0000000
--- a/frontend/src/components/Register.js
+++ /dev/null
@@ -1,148 +0,0 @@
-import { Link } from "react-router-dom";
-import ListErrors from "./ListErrors";
-import React from "react";
-import agent from "../agent";
-import { connect } from "react-redux";
-import {
- UPDATE_FIELD_AUTH,
- REGISTER,
- REGISTER_PAGE_UNLOADED,
-} from "../constants/actionTypes";
-
-const mapStateToProps = (state) => ({ ...state.auth });
-
-const mapDispatchToProps = (dispatch) => ({
- onChangeEmail: (value) =>
- dispatch({ type: UPDATE_FIELD_AUTH, key: "email", value }),
- onChangePassword: (value) =>
- dispatch({ type: UPDATE_FIELD_AUTH, key: "password", value }),
- onChangeUsername: (value) =>
- dispatch({ type: UPDATE_FIELD_AUTH, key: "username", value }),
- onSubmit: (username, email, password) => {
- const payload = agent.Auth.register(username, email, password);
- dispatch({ type: REGISTER, payload });
- },
- onUnload: () => dispatch({ type: REGISTER_PAGE_UNLOADED }),
-});
-
-class Register extends React.Component {
- constructor() {
- super();
- this.changeEmail = (ev) => this.props.onChangeEmail(ev.target.value);
- this.changePassword = (ev) => this.props.onChangePassword(ev.target.value);
- this.changeUsername = (ev) => this.props.onChangeUsername(ev.target.value);
- this.submitForm = (username, email, password) => (ev) => {
- ev.preventDefault();
- this.props.onSubmit(username, email, password);
- };
- }
-
- componentWillUnmount() {
- this.props.onUnload();
- }
-
- render() {
- const email = this.props.email;
- const password = this.props.password;
- const username = this.props.username;
-
- return (
-
-
-
-
-
Sign Up
-
-
-
-
-
-
- Have an account?
-
-
-
-
-
-
-
-
-
-
Your Settings
-
-
-
-
-
-
-
-
-
-
-
-