From 6757b3b383d9a47f5dfd1e28e81b1f32dcf3c528 Mon Sep 17 00:00:00 2001 From: Andrew Lee <87255788+leeaj8-uci@users.noreply.github.com> Date: Wed, 2 Aug 2023 05:41:45 -0700 Subject: [PATCH] Some bug fixes and updates to the README.md (#49) * Update yarn files + gitignore * Added error message that came up during maintenance * Fix issue where columns were displayed alphabetically instead of in their intended order * Some basic formatting for the User schema * Show error in backend when connecting even if there isn't a nice message * Make stylistic edits including minor edits to DB schema * Update schema slightly * Delete unneeded CD.yml file * (Tried to) upgrade packages * Update README.md --- .github/workflows/CD.yml | 30 - .gitignore | 3 +- .yarnrc.yml | 5 + README.md | 114 +- package.json | 24 +- public/logo512.png | Bin 0 -> 98422 bytes public/readme-images/add-data.png | Bin 0 -> 37949 bytes public/readme-images/dashboard-popup.png | Bin 0 -> 90446 bytes public/readme-images/dashboard.png | Bin 0 -> 48993 bytes public/readme-images/manage-data.png | Bin 0 -> 75886 bytes public/readme-images/query-data.png | Bin 0 -> 77264 bytes routes/rakers.router.js | 4 +- routes/tables.router.js | 9 +- server/db.js | 3 +- server/schema/clams.sql | 36 +- server/schema/computation.sql | 22 +- server/schema/raker.sql | 50 +- server/schema/survey.sql | 20 +- server/schema/user.sql | 10 +- yarn.lock | 9183 +++++++++++++--------- 20 files changed, 5854 insertions(+), 3659 deletions(-) delete mode 100644 .github/workflows/CD.yml create mode 100644 .yarnrc.yml create mode 100644 public/logo512.png create mode 100644 public/readme-images/add-data.png create mode 100644 public/readme-images/dashboard-popup.png create mode 100644 public/readme-images/dashboard.png create mode 100644 public/readme-images/manage-data.png create mode 100644 public/readme-images/query-data.png diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml deleted file mode 100644 index 9699159..0000000 --- a/.github/workflows/CD.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: EC2 Deploy - -on: - push: - branches: dev - -jobs: - Deploy: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Deploy in EC2 - env: - PRIVATE_KEY: ${{ secrets.AWS_EC2_PRIVATE_KEY }} - HOSTNAME : ${{ secrets.AWS_EC2_HOSTNAME }} - USER: ${{ secrets.AWS_EC2_USER }} - - run: | - echo "$PRIVATE_KEY" > private_key.pem && chmod 600 private_key.pem - ssh -o StrictHostKeyChecking=no -i private_key.pem ${USER}@${HOSTNAME} ' - - #Now we have got the access of EC2 and we will start the deploy . - cd ~/get-inspired-backend && - git checkout dev && - git stash && - git pull origin dev && - yarn && - pm2 restart app.js - ' diff --git a/.gitignore b/.gitignore index 5dc7d0a..fbcdf37 100644 --- a/.gitignore +++ b/.gitignore @@ -47,8 +47,9 @@ typings/ # TypeScript cache *.tsbuildinfo -# Optional npm cache directory +# Optional npm/yarn cache directories .npm +.yarn/ # Optional eslint cache .eslintcache diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 0000000..e55ce3b --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1,5 @@ +nodeLinker: node-modules + +plugins: + - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs + spec: "@yarnpkg/plugin-interactive-tools" diff --git a/README.md b/README.md index 4636607..6c1c356 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,101 @@ # Get Inspired +
+
+
+ 🌐Website | + Facebook | + Instagram | + Youtube +
-## Setting up development environment +Get Inspired promotes ocean restoration awareness and education among youths through engaging the community in environmental stewardship. They host programs that educate students on marine life and provide volunteer opportunities to restore and preserve marine ecosystems. -To start working on with this project, follow these steps: -1. Install the [EditorConfig plugin](https://editorconfig.org/#download) for your IDE. -1. Add the `.env` file stored in your projects Google Drive folder to the root of the project. -1. Navigate to the project folder in your terminal and run `npm install` to install required packages. +
+
+
+
+
+
+
+
8A+$rAF|GGHIVci$Ec^xG&h%fEl?17^Vf8JxS`u=#?{whWatl#t2!JJ?HqRB
z6mu^CbIJ&lHSg&bIaL{&D-`2@8FHI+QVGz&AWCCWtzO;c02SpQ|4ZQ$m~r-ec74t<
z{+DC8-N5U;VyXZv;h}9Eg|S>H$qFUs`t~}sfSHSx%0~?d#MZnd2XmS}?pZ9T0*-0}
zXdL}`9u7c0qbZBi*#n8X=s!lE0XVD`OQ$tI!M@;6Q@_YQZ?n XS`++l|NIFjE)|ekR1Z3UQeX;@RmI&yS-$n$
zFb8*chAiz!;H6%W;~Fkkr7$%~bH<{rIf1B)=SK#F?%V9I2$q$umoQG(U@>Ya|m^
zL;rhILg9M;HL_d+H-2YZk}p29m2%bPA6_}fg<^%0DX?oBrl6{Vl7i=^O8nzb&k)xo
zFFmo9T-~C({INkj09hwAbTbg4d$+qS#aF+u4P6TU?k8tBIaxqzflfep*?_<(1j6%q
z=kOFgNt2dLjICR)kELE;tXKG;35|5hpeyT<_gpH<#|I3lla!Js-Jqu{#lbx-JhZ2S
z;ei~Pl(iyjXR|>Q0@I)-5A7>(L%jtbfh(3dAx1b3nUuk{{tRuo#AnL-UyaE1tqVaa
zZqU*cr!`lwLi_skHn+!%n@kVbd^EPUC4{p}Y@LCKPowh$Y
z(fLeDzCqv9G7HFc0#q7^pK`V6&T8G9;Gyr|168GhjP2s$$Iv@GY!y%S^C8U
z603#Vo>({6g)_!$ING=Akv8Bvf?qH%ysAN$YNA+bg4AW)7pet1iPOdW6F7Ixg8IuWY3ZZi%SI)CvtL!
zjXqb
++9YSNMIZ1m{thPWInk1L7NZNw_wj^JAtdHR>&0*~M3ZHw0
zK8Uq`vBn~OrOy%qk}-q(wzqQsKn`mW+NDW*Q+)k~(;W;Uf|H{Y{+wT`@-MHQ=kI@h
zijj#WeBTd^zFX@H5jCF0%HIc!?aQyFlwx+F#OP=qx9p+GWzwdn6m4xL16wjA;=w8Y
z$_sWdN7G4*eLGs%)}N;8gPAl*C9TT|uGfNE>l&;3y6jEpX;1UQBmErMmcw+H+2J*Y
zxG6X}UF7^^5!dr-eZPIU&i>Z*CHm@YOY!_;{p{b>imn7Y^^c&y5rV3r_~6VuCoeAH
zxZZ8+lUkh?bj5D0y&gy@=xRyOACJ*z=?wQ}NT;l8eAYEaF>2FQ*0r_U5_o*FsTljV
zxAW&O@8o~|!@Ydvu|ArU7SdNirc<3aucX0(@_FsUDgN$zCpmd`7T5E`vDtk7%nkPd
z6w3~uoSNtCL
0O^E5#xl`8Q6uLn
z5xAfi3l1M0n`UgPa9!=QOr1