Skip to content

Commit

Permalink
Feature/feedback (#66)
Browse files Browse the repository at this point in the history
* Add information text due to backend issue

* feat: add mixpanel events (#64)

* remove debug

* feat: integrate ristek ads

* chore: bump version of ristek ads

* chore: revert config to use localhost

* chore: bump version of ristek ads to 1.2.6

* fix: disable mixpanel

* feat: create feedback modal

* feat: create feedback page

* feat: create google calendar popup

* feat: create admin login and feedback recap page

* fix: add todo comments for disabled analytics

* feat: integrate feedback feature with backend

---------

Co-authored-by: fajarriv <[email protected]>
Co-authored-by: fajarriv <[email protected]>
Co-authored-by: Valee <[email protected]>
Co-authored-by: Valerian Salim <[email protected]>
Co-authored-by: FreeJ1nG <[email protected]>
Co-authored-by: Andrew Jeremy <[email protected]>
  • Loading branch information
7 people authored Aug 2, 2024
1 parent f7da344 commit 4d7e122
Show file tree
Hide file tree
Showing 47 changed files with 9,088 additions and 6,121 deletions.
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
"@fontsource/poppins": "^4.4.5",
"@heroicons/react": "^1.0.2",
"@react-spring/web": "^9.7.3",
"@ristek-kit/ads": "^1.2.6",
"axios": "^0.19.0",
"copy-image-clipboard": "^2.1.2",
"framer-motion": "^4",
"html-to-image": "^1.9.0",
"ics": "^2.31.0",
"mixpanel-browser": "^2.48.1",
"query-string": "^6.8.1",
"react": "^16.8.6",
"react-burger-menu": "^2.6.10",
Expand All @@ -30,7 +32,7 @@
"react-redux": "^7.1.0",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.0.1",
"react-scripts": "^4.0.1",
"redux": "^4.0.4",
"styled-components": "^4.3.2"
},
Expand Down Expand Up @@ -60,8 +62,10 @@
"devDependencies": {
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^12.1.2",
"eslint": "^7.11.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-react-app": "^6.0.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.25.3",
"eslint-plugin-unused-imports": "^1.1.4",
Expand Down
6 changes: 5 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Provider } from "react-redux";
import { Router } from "react-router";
import { createBrowserHistory } from "history";

import { AdsProvider } from "@ristek-kit/ads";
import MediaQuery from "containers/MediaQuery";
import Loading from "containers/Loading";

Expand All @@ -11,6 +12,7 @@ import store from "./redux/store";

import config from "config";
import "./app.css";
import "@ristek-kit/ads/dist/styles.css";
import ScrollToTop from "utils/scroll";

const history = createBrowserHistory({ basename: config.BASE_URL });
Expand All @@ -20,7 +22,9 @@ function App() {
<Router history={history}>
<ScrollToTop />
<Provider store={store}>
<Routes />
<AdsProvider platform="SusunJadwal" theme="light">
<Routes />
</AdsProvider>
<MediaQuery />
<Loading />
</Provider>
Expand Down
5 changes: 2 additions & 3 deletions src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,6 @@ button {
-moz-appearance: none;
background: transparent;
padding: 0;
border: 0;
border-radius: 0;
line-height: 1;
}
Expand Down Expand Up @@ -603,7 +602,7 @@ button {
}

.small-offset-2 {
margin-left: 16.66667%
margin-left: 16.66667%;
}

.small-4 {
Expand Down Expand Up @@ -1974,7 +1973,7 @@ p + .stat {
.entryJadwal {
position: absolute;
width: calc((100% / 6) - 0.5rem);
background: #F2994A;
background: #f2994a;
color: #222222;
}

Expand Down
Binary file added src/assets/Feedback/Modal/bauhaus-feedback-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/Feedback/Modal/bauhaus-feedback-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Feedback/Page/bauhaus-feedback-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Feedback/Page/bauhaus-feedback-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/Feedback/Page/bauhaus-feedback-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendarModal/mulai.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendarModal/step1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendarModal/step2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendarModal/step3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendarModal/step4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendarModal/step5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendarModal/step6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendarModal/step7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/GoogleCalendarModal/step8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/Cards.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
Icon,
useColorModeValue,
} from "@chakra-ui/react";
import { GoMarkGithub } from "react-icons/go";
import { FaGithub } from "react-icons/fa6";

export const ContributorCard = ({ name, avatar, github, contributions }) => {
const theme = useColorModeValue("light", "dark");
Expand Down Expand Up @@ -61,7 +61,7 @@ export const ContributorCard = ({ name, avatar, github, contributions }) => {
>
<Icon
boxSize={"1.2rem"}
as={GoMarkGithub}
as={FaGithub}
color={theme === "light" ? "Black" : "dark.LightPurple"}
/>{" "}
Github
Expand Down
14 changes: 8 additions & 6 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@ const config = {
SSO_UI_URL: "https://sso.ui.ac.id/cas2",
AIRTABLE_BASE_ID: process.env.REACT_APP_BETA_AIRTABLE_BASE_ID,
AIRTABLE_API_KEY: process.env.REACT_APP_BETA_AIRTABLE_API_KEY,
AIRTABLE_TABLE_NAME: process.env.REACT_APP_BETA_AIRTABLE_TABLE_NAME
AIRTABLE_TABLE_NAME: process.env.REACT_APP_BETA_AIRTABLE_TABLE_NAME,
MIXPANEL_PROJECT_TOKEN: process.env.REACT_APP_MIXPANEL_PROJECT_TOKEN,
},
production: {
API_BASE_URL: process.env.REACT_APP_AWS_BACKEND_URL,
BASE_URL: "/"
BASE_URL: "/",
},
development: {
API_BASE_URL: "http://localhost:5000/susunjadwal/api",
BASE_URL: "/"
}
// API_BASE_URL: "http://localhost:5000/susunjadwal/api",
API_BASE_URL: "https://stg.api.susunjadwal.cs.ui.ac.id/susunjadwal/api",
BASE_URL: "/",
},
};

export default {
...config.base,
...config[process.env.NODE_ENV || "development"]
...config[process.env.NODE_ENV || "development"],
};
37 changes: 37 additions & 0 deletions src/containers/Admin/Feedbacks/feedback.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4d7e122

Please sign in to comment.