Code

Dev resolve conflicts#126

Code

Merged

JimmyTron merged 51 commits intoDevSpaceyaTech/SYT-Web-Redesign:Devfrom dev-resolve-conflictsSpaceyaTech/SYT-Web-Redesign:dev-resolve-conflictsCopy head branch name to clipboardFeb 6, 2024

+87-89

Commits

Commits on Jan 3, 2024

• init blog formatting

  Ase020

  committed
  6e46312

  Copy full SHA for 6e46312

• format blogs page

  Ase020

  committed
  6ef935d

  Copy full SHA for 6ef935d

• add line-clamp to podCard title&desc

  Ase020

  committed
  70fd0c4

  Copy full SHA for 70fd0c4

• return categories

  Ase020

  committed
  0cf2043

  Copy full SHA for 0cf2043

Commits on Jan 4, 2024

• add blog search functionality

  Ase020

  committed
  fbd9138

  Copy full SHA for fbd9138

• prevent blogWrapper.css styles affecting other components

  Ase020

  committed
  aae2da1

  Copy full SHA for aae2da1

• add text-primary & bg in global.css

  Ase020

  committed
  36becdf

  Copy full SHA for 36becdf

• style code on blog body

  Ase020

  committed
  cf2de42

  Copy full SHA for cf2de42

• wrap no result in a p tag

  Ase020

  committed
  8d751fc

  Copy full SHA for 8d751fc

• init pageNotFound

  Ase020

  committed
  62e59e6

  Copy full SHA for 62e59e6

• import 404 image

  Ase020

  committed
  1482eac

  Copy full SHA for 1482eac

• complete page not found page

  Ase020

  committed
  af0eedb

  Copy full SHA for af0eedb

Commits on Jan 5, 2024

• Merge pull request #98 from SpaceyaTech/blog-page-format

  Show description for d0fcc03
  JimmyTron

  authored
  d0fcc03

  Copy full SHA for d0fcc03

• import formatDistanceToNow (#100)

  Ase020

  authored
  68efe35

  Copy full SHA for 68efe35

Commits on Jan 6, 2024

• refactor service section

  Ase020

  committed
  21381d4

  Copy full SHA for 21381d4

• change param to title_slug

  Ase020

  committed
  7cd3014

  Copy full SHA for 7cd3014

• filter blogs by categories

  Ase020

  committed
  f061fc6

  Copy full SHA for f061fc6

• make blog categories scrollable

  Ase020

  committed
  7c53394

  Copy full SHA for 7c53394

• span components on the landing page

  Ase020

  committed
  55603c4

  Copy full SHA for 55603c4

• add download attribute internship document

  Ase020

  committed
  3176306

  Copy full SHA for 3176306

Commits on Jan 7, 2024

• fix route

  Ase020

  committed
  5afd015

  Copy full SHA for 5afd015

• fetch related blogs on blog page

  Ase020

  committed
  5915c09

  Copy full SHA for 5915c09

• refetch on page change

  Ase020

  committed
  85632ef

  Copy full SHA for 85632ef

• add error img

  Ase020

  committed
  8b414d1

  Copy full SHA for 8b414d1

• add condition filtering to cat

  Ase020

  committed
  cf9b90a

  Copy full SHA for cf9b90a

Commits on Jan 8, 2024

• add loader to blog page

  Ase020

  committed
  57f7f8e

  Copy full SHA for 57f7f8e

Commits on Jan 9, 2024

• build error500 mobile page

  Ase020

  committed
  7c8fa29

  Copy full SHA for 7c8fa29

• build error500 web page

  Ase020

  committed
  3045b72

  Copy full SHA for 3045b72

• remove img border

  Ase020

  committed
  37d3217

  Copy full SHA for 37d3217

• Merge branch 'main' into page-not-found

  Ase020

  authored
  1e0705d

  Copy full SHA for 1e0705d

• error 400 page build

  Ase020

  committed
  3876edc

  Copy full SHA for 3876edc

• Merge branch 'page-not-found' of github.com:SpaceyaTech/SYT-Web-Redesign into page-not-found

  Ase020

  committed
  a0e1171

  Copy full SHA for a0e1171

• error 400 page build

  Ase020

  committed
  b55f1e1

  Copy full SHA for b55f1e1

• error 403 page build

  Ase020

  committed
  0332d8e

  Copy full SHA for 0332d8e

• reinsert 404 page

  Ase020

  committed
  e3bd03b

  Copy full SHA for e3bd03b

• remove 403 route

  Ase020

  committed
  c4950cd

  Copy full SHA for c4950cd

• removed unbuilt routes

  Ase020

  committed
  5956c62

  Copy full SHA for 5956c62

• Filter out recurring current blog on related blogs fetched.

  collinskasyoki

  committed
  e8f2a34

  Copy full SHA for e8f2a34

• Merge pull request #102 from SpaceyaTech/related-blogs

  Show description for f5a9b22
  Ase020

  authored
  f5a9b22

  Copy full SHA for f5a9b22

• Merge branch 'main' into page-not-found

  Ase020

  authored
  54cb428

  Copy full SHA for 54cb428

• Add error500 svg img

  Ase020

  committed
  929c7fb

  Copy full SHA for 929c7fb

• Merge branch 'page-not-found' of github.com:SpaceyaTech/SYT-Web-Redesign into page-not-found

  Ase020

  committed
  482a39f

  Copy full SHA for 482a39f

• Merge pull request #103 from SpaceyaTech/page-not-found

  Show description for 226ca0a
  JimmyTron

  authored
  226ca0a

  Copy full SHA for 226ca0a

Commits on Jan 10, 2024

• Merge branch 'main' into remove-pages-wip-build

  JimmyTron

  authored
  4fc2626

  Copy full SHA for 4fc2626

• Merge pull request #104 from SpaceyaTech/remove-pages-wip-build

  Show description for 6bff912
  JimmyTron

  authored
  6bff912

  Copy full SHA for 6bff912

• Merge branch 'main' into Dev

  Ase020

  committed
  03da624

  Copy full SHA for 03da624

Commits on Jan 11, 2024

• Remove duplicates from files

  Ase020

  committed
  ac4b741

  Copy full SHA for ac4b741

• duplicate??

  Ase020

  committed
  973e815

  Copy full SHA for 973e815

• remove comment tag

  Ase020

  committed
  f9c4a9f

  Copy full SHA for f9c4a9f

Commits on Jan 31, 2024

• Resolve conflicts

  Ase020

  committed
  2cce4bc

  Copy full SHA for 2cce4bc

• resolve dev conflicts

  Ase020

  committed
  5ec78e5

  Copy full SHA for 5ec78e5