Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging #72

Merged
merged 13 commits into from
Aug 7, 2024
Merged

Staging #72

merged 13 commits into from
Aug 7, 2024

Conversation

FreeJ1nG
Copy link
Contributor

@FreeJ1nG FreeJ1nG commented Aug 5, 2024

No description provided.

lontonggg and others added 13 commits August 3, 2024 01:01
* 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]>
* 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

* fix: fix social media icon bug in footer

* fix: replace ristek logo from old to new

* fix: fix routing and design issues

---------

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]>
* fix: solve merge conflicts

* feat: integrate admin login and feedback recap page with backend

* feat: add google calendar popup to daftar jadwal page

* refactor: remove unused feedback dummy data
* fix: solve merge conflicts

* feat: integrate admin login and feedback recap page with backend

* feat: add google calendar popup to daftar jadwal page

* refactor: remove unused feedback dummy data

* hotfix: add token validation
@FreeJ1nG FreeJ1nG merged commit a522fb5 into main Aug 7, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants