Merge remote-tracking branch 'origin/main' into refactor/tabs-structure

IdoBouskila · Nov 30, 2024 · 377bc7c · 377bc7c
2 parents 9a01e16 + 43e87e0
commit 377bc7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/client-lint.yml b/.github/workflows/client-lint.yml
@@ -16,6 +16,11 @@ jobs:
         with:
           node-version: '18'
 
+      # Install dependencies for the server as well, because the client depends on it (tRPC)
+      - name: Install dependencies (server)
+        working-directory: ./server
+        run: yarn install
+
       - name: Install dependencies (client)
         working-directory: ./client
         run: yarn install

diff --git a/client/src/components/dashboard.tsx b/client/src/components/dashboard.tsx
@@ -1,9 +1,12 @@
 import Map from './map';
+import SearchBar from './search-bar/search-bar';
 import { PiWind, PiEyeLight, PiSunLight, PiDropLight, PiWindLight, PiThermometerSimple } from 'react-icons/pi';
 
 const Dashboard = () => {
     return (
         <div className='dashboard'>
+            <SearchBar />
+
             <div className='current-weather-container'>
                 <div className='title-container'>
                     <h1>Current Weather</h1>